From a53be4f328428757df408185a4492f15c1de0bd5 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 21 Oct 2001 01:18:42 +0000 Subject: [PATCH] PROP_MODEL and PROP_EXPANDER_COLUMN can be NULL, so don't do a object case Sat Oct 20 18:16:04 2001 Manish Singh * gtk/gtktreeview.c (gtk_treeview_get_property): PROP_MODEL and PROP_EXPANDER_COLUMN can be NULL, so don't do a object case check for those --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreeview.c | 6 +++--- 8 files changed, 45 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1147775a1..577e0b3515 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Oct 20 18:16:04 2001 Manish Singh + + * gtk/gtktreeview.c (gtk_treeview_get_property): PROP_MODEL and + PROP_EXPANDER_COLUMN can be NULL, so don't do a object case check + for those + Sat Oct 20 19:38:16 2001 Owen Taylor * demos/*.c demos/gdk-pixbuf/*.c: Eliminate gtk_signal_* diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c1147775a1..577e0b3515 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Oct 20 18:16:04 2001 Manish Singh + + * gtk/gtktreeview.c (gtk_treeview_get_property): PROP_MODEL and + PROP_EXPANDER_COLUMN can be NULL, so don't do a object case check + for those + Sat Oct 20 19:38:16 2001 Owen Taylor * demos/*.c demos/gdk-pixbuf/*.c: Eliminate gtk_signal_* diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c1147775a1..577e0b3515 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Oct 20 18:16:04 2001 Manish Singh + + * gtk/gtktreeview.c (gtk_treeview_get_property): PROP_MODEL and + PROP_EXPANDER_COLUMN can be NULL, so don't do a object case check + for those + Sat Oct 20 19:38:16 2001 Owen Taylor * demos/*.c demos/gdk-pixbuf/*.c: Eliminate gtk_signal_* diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c1147775a1..577e0b3515 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Oct 20 18:16:04 2001 Manish Singh + + * gtk/gtktreeview.c (gtk_treeview_get_property): PROP_MODEL and + PROP_EXPANDER_COLUMN can be NULL, so don't do a object case check + for those + Sat Oct 20 19:38:16 2001 Owen Taylor * demos/*.c demos/gdk-pixbuf/*.c: Eliminate gtk_signal_* diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c1147775a1..577e0b3515 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Oct 20 18:16:04 2001 Manish Singh + + * gtk/gtktreeview.c (gtk_treeview_get_property): PROP_MODEL and + PROP_EXPANDER_COLUMN can be NULL, so don't do a object case check + for those + Sat Oct 20 19:38:16 2001 Owen Taylor * demos/*.c demos/gdk-pixbuf/*.c: Eliminate gtk_signal_* diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c1147775a1..577e0b3515 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Oct 20 18:16:04 2001 Manish Singh + + * gtk/gtktreeview.c (gtk_treeview_get_property): PROP_MODEL and + PROP_EXPANDER_COLUMN can be NULL, so don't do a object case check + for those + Sat Oct 20 19:38:16 2001 Owen Taylor * demos/*.c demos/gdk-pixbuf/*.c: Eliminate gtk_signal_* diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c1147775a1..577e0b3515 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Oct 20 18:16:04 2001 Manish Singh + + * gtk/gtktreeview.c (gtk_treeview_get_property): PROP_MODEL and + PROP_EXPANDER_COLUMN can be NULL, so don't do a object case check + for those + Sat Oct 20 19:38:16 2001 Owen Taylor * demos/*.c demos/gdk-pixbuf/*.c: Eliminate gtk_signal_* diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 2f15d300ec..7add0e79fc 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1,7 +1,7 @@ /* gtktreeview.c * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford * - This library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. @@ -945,7 +945,7 @@ gtk_tree_view_get_property (GObject *object, switch (prop_id) { case PROP_MODEL: - g_value_set_object (value, G_OBJECT (tree_view->priv->model)); + g_value_set_object (value, tree_view->priv->model); break; case PROP_HADJUSTMENT: g_value_set_object (value, G_OBJECT (tree_view->priv->hadjustment)); @@ -957,7 +957,7 @@ gtk_tree_view_get_property (GObject *object, g_value_set_boolean (value, gtk_tree_view_get_headers_visible (tree_view)); break; case PROP_EXPANDER_COLUMN: - g_value_set_object (value, G_OBJECT (tree_view->priv->expander_column)); + g_value_set_object (value, tree_view->priv->expander_column); break; case PROP_REORDERABLE: g_value_set_boolean (value, tree_view->priv->reorderable); -- 2.30.2